merge trunk
authorK. Handa <handa@gnu.org>
Tue, 31 Dec 2013 14:59:35 +0000 (23:59 +0900)
committerK. Handa <handa@gnu.org>
Tue, 31 Dec 2013 14:59:35 +0000 (23:59 +0900)
commit025511404fc0a0bfc239d068fcbc9c3d55ad8047
treedf6fbca561a907c3243226a2d5ff941d4cda87ac
parent8c0fc1f65e2defb28e1a25c21ebf1b4d4be3763d
parent34171cec46b18a39b4c3bd22c586d2c8260587a8
merge trunk